from trunk
authorKenichi Handa <handa@m17n.org>
Mon, 18 Jan 2010 00:58:26 +0000 (09:58 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 18 Jan 2010 00:58:26 +0000 (09:58 +0900)

Trivial merge